bitkeeper revision 1.1029 (40e1c6ce1NufVIrsLOg06kNbotFFZA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 29 Jun 2004 19:45:18 +0000 (19:45 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 29 Jun 2004 19:45:18 +0000 (19:45 +0000)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/hp.bk


Trivial merge